bitkeeper revision 1.1159.212.119 (42080936hYySAGh0O5TePVvGrzAKtA)

Enable PCI.

Signed-off-by: Xin B Li <xin.b.li@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian@xensource.com

diff --git a/tools/examples/bochsrc b/tools/examples/bochsrc
index 8075a7658b3e78f6c43c439e5bf57dc5430d32c5..d80884b3c89ea701adc7a69de72924293de78a19 100644 (file)
--- a/tools/examples/bochsrc
+++ b/tools/examples/bochsrc
@@ -6,6 +6,8 @@ floppyb: 1_44=b.img, status=inserted
 # if you don't use absolute paths below, bochs looks under the cwd of xend, 
 # which is usually "/"
 #ata0-master: type=disk, path=/var/images/min-el3-i386.img, cylinders=800, heads=4, spt=32
+i440fxsupport: enabled=1
+ne2k: ioaddr=0x300, irq=9, mac=b0:c4:22:01:00:00, ethmod=linux, ethdev=eth0
 ata0-master: type=disk, path=/var/images/1g-el3-i386.img, mode=flat, cylinders=2048, heads=16, spt=63
 boot: c
 

diff --git a/tools/ioemu/include/config.h b/tools/ioemu/include/config.h
index 5b7b9c6f7a9335b06177a6b845fc09646dfcebc5..e48f2d97e5c2e3d718116bcc5b54807d2d147fc6 100644 (file)
--- a/tools/ioemu/include/config.h
+++ b/tools/ioemu/include/config.h
@@ -687,13 +687,13 @@ typedef
 #define BX_NUM_SIMULATORS 1
 
 // limited i440FX PCI support
-#define BX_PCI_SUPPORT 0
+#define BX_PCI_SUPPORT 1
 
 // Experimental VGA on PCI
 #define BX_PCI_VGA_SUPPORT 1
 
 // limited USB on PCI
-#define BX_PCI_USB_SUPPORT 0
+#define BX_PCI_USB_SUPPORT 1
 
 #if (BX_PCI_USB_SUPPORT && !BX_PCI_SUPPORT)
 #error To enable USB, you must also enable PCI